From baf117c92ec96485d34967100d81f016c4f2ed20 Mon Sep 17 00:00:00 2001
From: "robertlipe@gmail.com"
 <robertlipe@gmail.com@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 6 Sep 2011 01:22:26 +0000
Subject: [PATCH] Fix the stupid windows translation bug.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4090 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/gui/mainwindow.cpp | 15 ++++++++++-----
 gpsbabel/gui/makesetup.bat  | 34 ++++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/gpsbabel/gui/mainwindow.cpp b/gpsbabel/gui/mainwindow.cpp
index 56a8913ad..ff67d893a 100644
--- a/gpsbabel/gui/mainwindow.cpp
+++ b/gpsbabel/gui/mainwindow.cpp
@@ -247,8 +247,7 @@ void MainWindow::createLanguageMenu(void)
     defaultLocale.truncate(defaultLocale.lastIndexOf('_')); // e.g. "de"
 
     langPath = QApplication::applicationDirPath();
-    langPath.append("/translations");
-//fprintf(stderr, "Looking in %s\n", qPrintable(langPath));
+    langPath.append("/translations/");
     QDir dir(langPath);
     QStringList fileNames = dir.entryList(QStringList("GPSBabelFE*.qm"));
 
@@ -302,9 +301,15 @@ void MainWindow::loadLanguage(const QString& rLanguage)
     QLocale locale = QLocale(currLang);
     QLocale::setDefault(locale);
     QString languageName = QLocale::languageToString(locale.language());
-    switchTranslator(translator, QString("gpsbabelfe_%1.qm").arg(rLanguage));
-    switchTranslator(translatorCore, QString("gpsbabel__%1.qm").arg(rLanguage));
-    switchTranslator(translatorQt, QString("qt_%1.qm").arg(rLanguage));
+    // It's baffling to me that this is required.  On Mac, we absolutely do not have to do this.
+#if defined (Q_OS_WIN)
+#define LANGUAGE_DIR "translations/"
+#else
+#define LANGUAGE_DIR ""
+#endif
+    switchTranslator(translator, QString(LANGUAGE_DIR "gpsbabelfe_%1.qm").arg(rLanguage));
+    switchTranslator(translatorCore, QString(LANGUAGE_DIR "gpsbabel__%1.qm").arg(rLanguage));
+    switchTranslator(translatorQt, QString(LANGUAGE_DIR " qt_%1.qm").arg(rLanguage));
   }
 }
 
diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat
index f9f5c4867..27f93c8de 100644
--- a/gpsbabel/gui/makesetup.bat
+++ b/gpsbabel/gui/makesetup.bat
@@ -13,11 +13,15 @@ mkdir qtdir\plugins\imageformats
 mkdir qtdir\mingw
 
 rem Basic Qt runtime DLLs
+if "%QTDIR%"=="" call \QtSDK\Desktop\Qt\4.7.4\mingw\bin\qtenv2.bat
 copy %QTDIR%\bin\QtCore4.dll qtdir\bin
 copy %QTDIR%\bin\QtGui4.dll qtdir\bin
 copy %QTDIR%\bin\QtWebkit4.dll qtdir\bin
 copy %QTDIR%\bin\QtXml4.dll qtdir\bin
 copy %QTDIR%\bin\QtNetwork4.dll qtdir\bin
+copy %QTDIR%\bin\mingwm10.dll qtdir\bin
+copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin
+copy %QTDIR%\bin\phonon4.dll qtdir\bin
 
 rem Image format plugins needed at runtime, but not debug verions
 xcopy %QTDIR%\plugins\imageformats qtdir\plugins\imageformats
@@ -33,22 +37,24 @@ copy %QTDIR%\translations\qt_*.qm qtdir\translations
 del qtdir\translations\qt_help*
 
 rem Generate the compiled translations
-lrelease gpsbabel_de.ts
-lrelease gpsbabel_es.ts
-lrelease gpsbabel_fr.ts
-lrelease gpsbabel_hu.ts
-lrelease gpsbabel_it.ts
-lrelease gpsbabelfe_de.ts
-lrelease gpsbabelfe_es.ts
-lrelease gpsbabelfe_fr.ts
-lrelease gpsbabelfe_hu.ts
-lrelease gpsbabelfe_it.ts
-lrelease gpsbabelfe_ru.ts
-
+rem lrelease gpsbabel_de.ts
+rem lrelease gpsbabel_es.ts
+rem lrelease gpsbabel_fr.ts
+rem lrelease gpsbabel_hu.ts
+rem lrelease gpsbabel_it.ts
+rem lrelease gpsbabelfe_de.ts
+rem lrelease gpsbabelfe_es.ts
+rem lrelease gpsbabelfe_fr.ts
+rem lrelease gpsbabelfe_hu.ts
+rem lrelease gpsbabelfe_it.ts
+rem lrelease gpsbabelfe_ru.ts
+rem for /f %%a in (dir /b *.ts) do lrelease %%a
+
+copy ..\msvc\Expat\libexpat.dll release
 
 "c:\Program Files\Inno Setup 5\ISCC.exe" setup.iss
 
 rem cleanup
 rd /q /s qtdir
-del gpsbabel_*.qm
-del gpsbabelfe_*.qm
+rem del gpsbabel_*.qm
+rem del gpsbabelfe_*.qm
-- 
2.30.2